From 0d406473ac229e07863317ae92771d067494bf06 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Thu, 22 Dec 2005 23:49:36 +0000 Subject: [PATCH] CET-workarround for gpx files removed. "encoding=UTF-8" for gpx format is standard from now. --- gpsbabel/reference/coastexp.ref | 2 +- gpsbabel/reference/coastexp.ref3 | 2 +- gpsbabel/reference/igc1.gpx | 2 +- gpsbabel/reference/igc1_gpx.out | 2 +- gpsbabel/reference/igc2_gpx.out | 2 +- gpsbabel/reference/route/bcr-sample.gpx | 2 +- gpsbabel/reference/track/pathaway.gpx | 2 +- gpsbabel/reference/track/vitosmt_t.gpx | 2 +- gpsbabel/reference/vitosmt.gpx | 2 +- gpsbabel/testo | 29 ++++++++++--------------- 10 files changed, 20 insertions(+), 27 deletions(-) diff --git a/gpsbabel/reference/coastexp.ref b/gpsbabel/reference/coastexp.ref index 492e32f3e..de4fac599 100755 --- a/gpsbabel/reference/coastexp.ref +++ b/gpsbabel/reference/coastexp.ref @@ -1,4 +1,4 @@ - + + + + + + + + + $TMPDIR/comp_gpx1 - sed -e '1d' $2 > $TMPDIR/comp_gpx2 - compare $TMPDIR/comp_gpx1 $TMPDIR/comp_gpx2 -} - # Some formats are just too boring to test. The ones that # are xcsv include # garmin301 @@ -456,11 +449,11 @@ compare ${TMPDIR}/navi.wpt reference/navicache.ref # # CoastalExplorer.. ${PNAME} -r -i coastexp -f reference/coastexp.nob -o gpx -F ${TMPDIR}/coastexp.gpx -compare_gpx ${TMPDIR}/coastexp.gpx reference/coastexp.ref +compare ${TMPDIR}/coastexp.gpx reference/coastexp.ref ${PNAME} -r -i gpx -f ${TMPDIR}/coastexp.gpx -o coastexp -F ${TMPDIR}/coastexp.nob compare ${TMPDIR}/coastexp.nob reference/coastexp.ref2 ${PNAME} -w -i coastexp -f reference/coastexp.nob -o gpx -F ${TMPDIR}/coastexp.gpx -compare_gpx ${TMPDIR}/coastexp.gpx reference/coastexp.ref3 +compare ${TMPDIR}/coastexp.gpx reference/coastexp.ref3 ${PNAME} -w -i gpx -f ${TMPDIR}/coastexp.gpx -o coastexp -F ${TMPDIR}/coastexp.nob compare ${TMPDIR}/coastexp.nob reference/coastexp.ref4 # @@ -602,7 +595,7 @@ sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_se compare ${TMPDIR}/igc_sed.out reference/igc1_igc.out ${PNAME} -i igc -f ${TMPDIR}/igc.out -o gpx -F ${TMPDIR}/igc.gpx -compare_gpx ${TMPDIR}/igc.gpx reference/igc1_gpx.out +compare ${TMPDIR}/igc.gpx reference/igc1_gpx.out ${PNAME} -i gpx -f ${TMPDIR}/igc.gpx -o igc -F ${TMPDIR}/igc.out sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_sed.out @@ -614,14 +607,14 @@ compare ${TMPDIR}/igc_sed.out reference/igc1_3d.out ${PNAME} -i igc -f reference/igc2.igc -o gpx -F ${TMPDIR}/igc.gpx -compare_gpx ${TMPDIR}/igc.gpx reference/igc2_gpx.out +compare ${TMPDIR}/igc.gpx reference/igc2_gpx.out ${PNAME} -i gpx -f ${TMPDIR}/igc.gpx -o igc -F ${TMPDIR}/igc.out sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_sed.out compare ${TMPDIR}/igc_sed.out reference/igc2_igc.out ${PNAME} -i igc -f ${TMPDIR}/igc.out -o gpx -F ${TMPDIR}/igc.gpx -compare_gpx ${TMPDIR}/igc.gpx reference/igc2_gpx.out +compare ${TMPDIR}/igc.gpx reference/igc2_gpx.out # # Google Maps XML test @@ -745,7 +738,7 @@ ${PNAME} -i pathaway -f ${TMPDIR}/pathaway-geo.pdb -o geo -F ${TMPDIR}/pathaway- compare ${TMPDIR}/pathaway-geo.loc reference/pathaway-geo.loc rm -f ${TMPDIR}/pathaway* ${PNAME} -t -i pathaway -f reference/track/pathaway.pdb -o gpx -F ${TMPDIR}/pathaway.gpx -compare_gpx ${TMPDIR}/pathaway.gpx reference/track/pathaway.gpx +compare ${TMPDIR}/pathaway.gpx reference/track/pathaway.gpx # # Garmin GPS Database .gdb tests @@ -766,9 +759,9 @@ ${PNAME} -w -r -t -i gdb -f ${TMPDIR}/gdb-sample.gdb -o gpx -F ${TMPDIR}/gdb-sam # rm -f ${TMPDIR}/vitosmt* ${PNAME} -i vitosmt -f reference/vitosmt.smt -o gpx -F ${TMPDIR}/vitosmt.gpx -compare_gpx ${TMPDIR}/vitosmt.gpx reference/vitosmt.gpx +compare ${TMPDIR}/vitosmt.gpx reference/vitosmt.gpx ${PNAME} -t -i vitosmt -f reference/vitosmt.smt -o gpx -F ${TMPDIR}/vitosmt_t.gpx -compare_gpx ${TMPDIR}/vitosmt_t.gpx reference/track/vitosmt_t.gpx +compare ${TMPDIR}/vitosmt_t.gpx reference/track/vitosmt_t.gpx # # tracks filter tests @@ -777,18 +770,18 @@ compare_gpx ${TMPDIR}/vitosmt_t.gpx reference/track/vitosmt_t.gpx rm -f ${TMPDIR}/trackfilter* ${PNAME} -t -i gpx -f reference/track/trackfilter.gpx -x track,pack,split,title="LOG-%Y%m%d" -o gpx -F ${TMPDIR}/trackfilter.gpx -compare_gpx ${TMPDIR}/trackfilter.gpx reference/track/trackfilter.gpx +compare ${TMPDIR}/trackfilter.gpx reference/track/trackfilter.gpx # # Map&Guide Motorrad Routenplaner .bcr files test # rm -f ${TMPDIR}/bcr* ${PNAME} -r -i bcr -f reference/route/bcr-sample.bcr -o gpx -F ${TMPDIR}/bcr-sample.gpx -compare_gpx ${TMPDIR}/bcr-sample.gpx reference/route/bcr-sample.gpx +compare ${TMPDIR}/bcr-sample.gpx reference/route/bcr-sample.gpx ${PNAME} -r -i gpx -f reference/route/bcr-sample.gpx -o bcr -F ${TMPDIR}/bcr-sample2.bcr compare reference/route/bcr-sample2.bcr ${TMPDIR}/bcr-sample2.bcr ${PNAME} -r -i bcr -f ${TMPDIR}/bcr-sample2.bcr -o gpx -F ${TMPDIR}/bcr-sample2.gpx -compare_gpx reference/route/bcr-sample.gpx ${TMPDIR}/bcr-sample2.gpx +compare reference/route/bcr-sample.gpx ${TMPDIR}/bcr-sample2.gpx # # cet - Character encoding transformation tests -- 2.30.2